From: addshore <addshorewiki@gmail.com>
Date: Thu, 6 Mar 2014 19:36:29 +0000 (+0100)
Subject: Split MessageTest::testMessageParamTypes
X-Git-Tag: 1.31.0-rc.0~16713^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=a9fb88abb029c53f76b839cb2c0b641a03e50cac;p=lhc%2Fweb%2Fwiklou.git

Split MessageTest::testMessageParamTypes

Change-Id: I2099fa8a27a88bceb77c25e1ee08fb71eca318dc
---

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index 71ebd6a7d2..3086ff1934 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -77,55 +77,84 @@ class MessageTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * FIXME: This should not need database, but Language#formatExpiry does (bug 55912)
-	 * @group Database
-	 * @todo this should be split up into multiple test methods
 	 * @covers Message::numParams
-	 * @covers Message::durationParams
-	 * @covers Message::expiryParams
-	 * @covers Message::timeperiodParams
-	 * @covers Message::sizeParams
-	 * @covers Message::bitrateParams
 	 */
-	public function testMessageParamTypes() {
+	public function testMessageNumParams() {
 		$lang = Language::factory( 'en' );
-
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatNum( 123456.789 ),
 			$msg->inLanguage( $lang )->numParams( 123456.789 )->plain(),
 			'numParams is handled correctly'
 		);
+	}
 
+	/**
+	 * @covers Message::durationParams
+	 */
+	public function testMessageDurationParams() {
+		$lang = Language::factory( 'en' );
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatDuration( 1234 ),
 			$msg->inLanguage( $lang )->durationParams( 1234 )->plain(),
 			'durationParams is handled correctly'
 		);
+	}
 
+	/**
+	 * FIXME: This should not need database, but Language#formatExpiry does (bug 55912)
+	 * @group Database
+	 * @covers Message::expiryParams
+	 */
+	public function testMessageExpiryParams() {
+		$lang = Language::factory( 'en' );
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatExpiry( wfTimestampNow() ),
 			$msg->inLanguage( $lang )->expiryParams( wfTimestampNow() )->plain(),
 			'expiryParams is handled correctly'
 		);
+	}
 
+	/**
+	 * @covers Message::timeperiodParams
+	 */
+	public function testMessageTimeperiodParams() {
+		$lang = Language::factory( 'en' );
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatTimePeriod( 1234 ),
 			$msg->inLanguage( $lang )->timeperiodParams( 1234 )->plain(),
 			'timeperiodParams is handled correctly'
 		);
+	}
 
+	/**
+	 * @covers Message::sizeParams
+	 */
+	public function testMessageSizeParams() {
+		$lang = Language::factory( 'en' );
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatSize( 123456 ),
 			$msg->inLanguage( $lang )->sizeParams( 123456 )->plain(),
 			'sizeParams is handled correctly'
 		);
+	}
 
+	/**
+	 * @covers Message::bitrateParams
+	 */
+	public function testMessageBitrateParams() {
+		$lang = Language::factory( 'en' );
 		$msg = new RawMessage( '$1' );
+
 		$this->assertEquals(
 			$lang->formatBitrate( 123456 ),
 			$msg->inLanguage( $lang )->bitrateParams( 123456 )->plain(),